Fixes for AIX compilation from Miroslaw Dobrzanski-Neumann, #72182.

Fri Feb 22 18:36:45 2002  Owen Taylor  <otaylor@redhat.com>

	Fixes for AIX compilation from Miroslaw Dobrzanski-Neumann,
	#72182.

	* demos/gtk-demo/main.c gtk/gtktreeview.c gtk/gtktoolbar.c
	gtk/gtkpaned.c gtk/gtkobject.c gtk/gtkcontainer.c
	gtk/gtkcolorsel.c gtk/gtkcellrender.c gdk/x11/xsettings-client.h:
	Squash trailing commas on enumerations.

	* gdk/gdktypes.h: Drop GDK_RELEASE_MASK to 1 << 30 instead
	of 1 << 31 to work around AIX compiler problem. (C standard
	seems to imply that compiler is required to use an unsigned
	type for the enum value in this case.)

	* gdk/gdkpixbuf-drawable.c: Fix lvalue casts.

	* gtk/gtkwindow.h: Fix use of enum types for bitfields ...
	compilers may choose to use a signed type for bitfields.

diff --git a/ChangeLog b/ChangeLog
index e5410f7a119527b21a5c335c3ff102ab64e348ea..a65d0bc23576156727a124c9a2847eb087c159f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Fri Feb 22 18:36:45 2002  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for AIX compilation from Miroslaw Dobrzanski-Neumann,
+       #72182.
+
+       * demos/gtk-demo/main.c gtk/gtktreeview.c gtk/gtktoolbar.c
+       gtk/gtkpaned.c gtk/gtkobject.c gtk/gtkcontainer.c 
+       gtk/gtkcolorsel.c gtk/gtkcellrender.c gdk/x11/xsettings-client.h:
+       Squash trailing commas on enumerations.
+
+       * gdk/gdktypes.h: Drop GDK_RELEASE_MASK to 1 << 30 instead
+       of 1 << 31 to work around AIX compiler problem. (C standard
+       seems to imply that compiler is required to use an unsigned
+       type for the enum value in this case.)
+
+       * gdk/gdkpixbuf-drawable.c: Fix lvalue casts.
+
+       * gtk/gtkwindow.h: Fix use of enum types for bitfields ... 
+       compilers may choose to use a signed type for bitfields.
+
 Sat Feb 23 00:34:01 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (validate_rows_handler): leave threads before

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e5410f7a119527b21a5c335c3ff102ab64e348ea..a65d0bc23576156727a124c9a2847eb087c159f1 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,23 @@
+Fri Feb 22 18:36:45 2002  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for AIX compilation from Miroslaw Dobrzanski-Neumann,
+       #72182.
+
+       * demos/gtk-demo/main.c gtk/gtktreeview.c gtk/gtktoolbar.c
+       gtk/gtkpaned.c gtk/gtkobject.c gtk/gtkcontainer.c 
+       gtk/gtkcolorsel.c gtk/gtkcellrender.c gdk/x11/xsettings-client.h:
+       Squash trailing commas on enumerations.
+
+       * gdk/gdktypes.h: Drop GDK_RELEASE_MASK to 1 << 30 instead
+       of 1 << 31 to work around AIX compiler problem. (C standard
+       seems to imply that compiler is required to use an unsigned
+       type for the enum value in this case.)
+
+       * gdk/gdkpixbuf-drawable.c: Fix lvalue casts.
+
+       * gtk/gtkwindow.h: Fix use of enum types for bitfields ... 
+       compilers may choose to use a signed type for bitfields.
+
 Sat Feb 23 00:34:01 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (validate_rows_handler): leave threads before

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e5410f7a119527b21a5c335c3ff102ab64e348ea..a65d0bc23576156727a124c9a2847eb087c159f1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,23 @@
+Fri Feb 22 18:36:45 2002  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for AIX compilation from Miroslaw Dobrzanski-Neumann,
+       #72182.
+
+       * demos/gtk-demo/main.c gtk/gtktreeview.c gtk/gtktoolbar.c
+       gtk/gtkpaned.c gtk/gtkobject.c gtk/gtkcontainer.c 
+       gtk/gtkcolorsel.c gtk/gtkcellrender.c gdk/x11/xsettings-client.h:
+       Squash trailing commas on enumerations.
+
+       * gdk/gdktypes.h: Drop GDK_RELEASE_MASK to 1 << 30 instead
+       of 1 << 31 to work around AIX compiler problem. (C standard
+       seems to imply that compiler is required to use an unsigned
+       type for the enum value in this case.)
+
+       * gdk/gdkpixbuf-drawable.c: Fix lvalue casts.
+
+       * gtk/gtkwindow.h: Fix use of enum types for bitfields ... 
+       compilers may choose to use a signed type for bitfields.
+
 Sat Feb 23 00:34:01 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (validate_rows_handler): leave threads before

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e5410f7a119527b21a5c335c3ff102ab64e348ea..a65d0bc23576156727a124c9a2847eb087c159f1 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,23 @@
+Fri Feb 22 18:36:45 2002  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for AIX compilation from Miroslaw Dobrzanski-Neumann,
+       #72182.
+
+       * demos/gtk-demo/main.c gtk/gtktreeview.c gtk/gtktoolbar.c
+       gtk/gtkpaned.c gtk/gtkobject.c gtk/gtkcontainer.c 
+       gtk/gtkcolorsel.c gtk/gtkcellrender.c gdk/x11/xsettings-client.h:
+       Squash trailing commas on enumerations.
+
+       * gdk/gdktypes.h: Drop GDK_RELEASE_MASK to 1 << 30 instead
+       of 1 << 31 to work around AIX compiler problem. (C standard
+       seems to imply that compiler is required to use an unsigned
+       type for the enum value in this case.)
+
+       * gdk/gdkpixbuf-drawable.c: Fix lvalue casts.
+
+       * gtk/gtkwindow.h: Fix use of enum types for bitfields ... 
+       compilers may choose to use a signed type for bitfields.
+
 Sat Feb 23 00:34:01 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (validate_rows_handler): leave threads before

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e5410f7a119527b21a5c335c3ff102ab64e348ea..a65d0bc23576156727a124c9a2847eb087c159f1 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,23 @@
+Fri Feb 22 18:36:45 2002  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for AIX compilation from Miroslaw Dobrzanski-Neumann,
+       #72182.
+
+       * demos/gtk-demo/main.c gtk/gtktreeview.c gtk/gtktoolbar.c
+       gtk/gtkpaned.c gtk/gtkobject.c gtk/gtkcontainer.c 
+       gtk/gtkcolorsel.c gtk/gtkcellrender.c gdk/x11/xsettings-client.h:
+       Squash trailing commas on enumerations.
+
+       * gdk/gdktypes.h: Drop GDK_RELEASE_MASK to 1 << 30 instead
+       of 1 << 31 to work around AIX compiler problem. (C standard
+       seems to imply that compiler is required to use an unsigned
+       type for the enum value in this case.)
+
+       * gdk/gdkpixbuf-drawable.c: Fix lvalue casts.
+
+       * gtk/gtkwindow.h: Fix use of enum types for bitfields ... 
+       compilers may choose to use a signed type for bitfields.
+
 Sat Feb 23 00:34:01 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (validate_rows_handler): leave threads before

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e5410f7a119527b21a5c335c3ff102ab64e348ea..a65d0bc23576156727a124c9a2847eb087c159f1 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,23 @@
+Fri Feb 22 18:36:45 2002  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for AIX compilation from Miroslaw Dobrzanski-Neumann,
+       #72182.
+
+       * demos/gtk-demo/main.c gtk/gtktreeview.c gtk/gtktoolbar.c
+       gtk/gtkpaned.c gtk/gtkobject.c gtk/gtkcontainer.c 
+       gtk/gtkcolorsel.c gtk/gtkcellrender.c gdk/x11/xsettings-client.h:
+       Squash trailing commas on enumerations.
+
+       * gdk/gdktypes.h: Drop GDK_RELEASE_MASK to 1 << 30 instead
+       of 1 << 31 to work around AIX compiler problem. (C standard
+       seems to imply that compiler is required to use an unsigned
+       type for the enum value in this case.)
+
+       * gdk/gdkpixbuf-drawable.c: Fix lvalue casts.
+
+       * gtk/gtkwindow.h: Fix use of enum types for bitfields ... 
+       compilers may choose to use a signed type for bitfields.
+
 Sat Feb 23 00:34:01 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (validate_rows_handler): leave threads before

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e5410f7a119527b21a5c335c3ff102ab64e348ea..a65d0bc23576156727a124c9a2847eb087c159f1 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,23 @@
+Fri Feb 22 18:36:45 2002  Owen Taylor  <otaylor@redhat.com>
+
+       Fixes for AIX compilation from Miroslaw Dobrzanski-Neumann,
+       #72182.
+
+       * demos/gtk-demo/main.c gtk/gtktreeview.c gtk/gtktoolbar.c
+       gtk/gtkpaned.c gtk/gtkobject.c gtk/gtkcontainer.c 
+       gtk/gtkcolorsel.c gtk/gtkcellrender.c gdk/x11/xsettings-client.h:
+       Squash trailing commas on enumerations.
+
+       * gdk/gdktypes.h: Drop GDK_RELEASE_MASK to 1 << 30 instead
+       of 1 << 31 to work around AIX compiler problem. (C standard
+       seems to imply that compiler is required to use an unsigned
+       type for the enum value in this case.)
+
+       * gdk/gdkpixbuf-drawable.c: Fix lvalue casts.
+
+       * gtk/gtkwindow.h: Fix use of enum types for bitfields ... 
+       compilers may choose to use a signed type for bitfields.
+
 Sat Feb 23 00:34:01 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (validate_rows_handler): leave threads before

diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index c59bf3184a5875ac5cbdc21d0b1f438b1701fbff..6f1a4abe180b6acc268a4f938e006a7113643539 100644 (file)
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -151,7 +151,7 @@ read_line (FILE *stream, GString *str)
  */
 enum {
   STATE_NORMAL,
-  STATE_IN_COMMENT,
+  STATE_IN_COMMENT
 };
 
 static gchar *tokens[] =

diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index 2926b5834d819f077aac12bdd0c02b6bc8f0aac1..0a15d98fc3597dfe0f0c54c4047c34d350b15722 100644 (file)
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -414,7 +414,7 @@ rgb565lsb (GdkImage    *image,
          ((char *) o)[0] = ((data >> 8) & 0xf8) | ((data >> 13) & 0x7);
          ((char *) o)[1] = ((data >> 3) & 0xfc) | ((data >> 9) & 0x3);
          ((char *) o)[2] = ((data << 3) & 0xf8) | ((data >> 2) & 0x7);
-          ((char *) o) += 3;
+         o = (guint16 *) (((char *) o) + 3);
           ++xx;
        }
 
@@ -519,7 +519,7 @@ rgb565msb (GdkImage    *image,
          ((char *) o)[1] = ((data >> 3) & 0xfc) | ((data >> 9) & 0x3);
          ((char *) o)[2] = ((data << 3) & 0xf8) | ((data >> 2) & 0x7);
 
-          ((char *) o) += 3;
+         o = (guint16 *) (((char *) o) + 3);
           ++xx;
        }
 
@@ -745,7 +745,7 @@ rgb555lsb (GdkImage     *image,
          ((char *) o)[0] = (data & 0x7c00) >> 7 | (data & 0x7000) >> 12;
          ((char *) o)[1] = (data & 0x3e0) >> 2 | (data & 0x380) >> 7;
          ((char *) o)[2] = (data & 0x1f) << 3 | (data & 0x1c) >> 2;
-          ((char *) o) += 3;
+         o = (guint16 *) (((char *) o) + 3);
           ++xx;
        }
 
@@ -845,7 +845,7 @@ rgb555msb (GdkImage    *image,
          ((char *) o)[1] = (data & 0x3e0) >> 2 | (data & 0x380) >> 7;
          ((char *) o)[2] = (data & 0x1f) << 3 | (data & 0x1c) >> 2;
 
-          ((char *) o) += 3;
+         o = (guint16 *) (((char *) o) + 3);
           ++xx;
        }
 

diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 212c366dd05bdde06ad269d61a7f68eebdff3acc..5023ef0f3a6d5a5e1be7c6da525a3e1f456a8775 100644 (file)
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -130,7 +130,7 @@ typedef enum
   GDK_BUTTON5_MASK  = 1 << 12,
   /* The next few modifiers are used by XKB, so we skip to the end
    */
-  GDK_RELEASE_MASK  = 1u << 31,
+  GDK_RELEASE_MASK  = 1 << 30,
   GDK_MODIFIER_MASK = GDK_RELEASE_MASK | 0x1fff
 } GdkModifierType;
 

diff --git a/gdk/x11/xsettings-client.h b/gdk/x11/xsettings-client.h
index 12018295fb27b32d3709457c3111712c6938b989..1b13fe3bba72b603b155290c6de74b5f869222fc 100644 (file)
--- a/gdk/x11/xsettings-client.h
+++ b/gdk/x11/xsettings-client.h
@@ -36,7 +36,7 @@ typedef enum
 {
   XSETTINGS_ACTION_NEW,
   XSETTINGS_ACTION_CHANGED,
-  XSETTINGS_ACTION_DELETED,
+  XSETTINGS_ACTION_DELETED
 } XSettingsAction;
 
 typedef void (*XSettingsNotifyFunc) (const char       *name,

diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index f2cdb9cf2d6f86306054c36d9d63ec6df6e12fa8..8b1396622678f441067c380f4b14a5a653f43637 100644 (file)
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -43,7 +43,7 @@ enum {
   PROP_WIDTH,
   PROP_HEIGHT,
   PROP_IS_EXPANDER,
-  PROP_IS_EXPANDED,
+  PROP_IS_EXPANDED
 };
 
 

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 0a7f2d9f2e919ec52006a7450b0f154fd284bd4c..c47164634c9aa8d600fb646c1153d5058be8f044 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -80,7 +80,7 @@ enum {
   PROP_HAS_PALETTE,
   PROP_HAS_OPACITY_CONTROL,
   PROP_CURRENT_COLOR,
-  PROP_CURRENT_ALPHA,
+  PROP_CURRENT_ALPHA
 };
 
 enum {

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index b03a068a7834115248f664857e1bca0e9103692e..3065da386b3a374f9ceb3182dc6d14ac957c2037 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -51,7 +51,7 @@ enum {
   PROP_0,
   PROP_BORDER_WIDTH,
   PROP_RESIZE_MODE,
-  PROP_CHILD,
+  PROP_CHILD
 };
 
 #define PARAM_SPEC_PARAM_ID(pspec)              ((pspec)->param_id)

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index e20680a4d01d35a4eb2315cdfb287b1fd65875c2..7af316c06609958e7eed9acb0cb8c92507533b56 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -38,7 +38,7 @@ enum {
 };
 enum {
   PROP_0,
-  PROP_USER_DATA,
+  PROP_USER_DATA
 };
 
 

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 85098727c93151860ff15cf60ecac9bc132d7bcc..bf15fd2f01d3c96b047cebcdc00a78d4815f1f3b 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -1260,7 +1260,7 @@ gtk_paned_move_handle (GtkPaned      *paned,
       
       enum {
        SINGLE_STEP_SIZE = 1,
-       PAGE_STEP_SIZE   = 75,
+       PAGE_STEP_SIZE   = 75
       };
       
       old_position = gtk_paned_get_position (paned);

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 5517417bf881e7747dcb76fa4d62f9829ca4dcad..ac6d1d14b74300fe8412afc35b3c327b6985611b 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -53,7 +53,7 @@
 enum {
   PROP_0,
   PROP_ORIENTATION,
-  PROP_TOOLBAR_STYLE,
+  PROP_TOOLBAR_STYLE
 };
 
 enum {

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 282b1a6c49ef505335f0911ec694c55be5ff552c..f8c3ac6e0a9de422f60de36568d232a487e7659d 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -122,7 +122,7 @@ enum {
   PROP_REORDERABLE,
   PROP_RULES_HINT,
   PROP_ENABLE_SEARCH,
-  PROP_SEARCH_COLUMN,
+  PROP_SEARCH_COLUMN
 };
 
 static void     gtk_tree_view_class_init           (GtkTreeViewClass *klass);

diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 329fcdc4421accd592c1a310f8e4db355e503efc..393e02849535763bb260d8596f3a5ae0bb32b274 100644 (file)
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -82,7 +82,7 @@ struct _GtkWindow
   guint need_default_position : 1;
   guint need_default_size : 1;
   guint position : 3;
-  GtkWindowType type : 4;
+  guint type : 4; /* GtkWindowType */ 
   guint has_user_ref_count : 1;
   guint has_focus : 1;
 
@@ -97,8 +97,8 @@ struct _GtkWindow
   guint maximize_initially : 1;
   guint decorated : 1;
   
-  GdkWindowTypeHint type_hint : 3;
-  GdkGravity gravity : 5;
+  guint type_hint : 3; /* GdkWindowTypeHint */ 
+  guint gravity : 5; /* GdkGravity */ 
   
   guint frame_left;
   guint frame_top;